From 2b5e66993f0d5325e72679c2b4cbd28789cb397a Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Sun, 15 Dec 2002 07:23:36 +0000 Subject: [PATCH] (smtpmail-via-smtp): Fall back to user-mail-address as sender. --- lisp/mail/smtpmail.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index b13ee6bda9d..17b02e3d6f9 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -541,7 +541,9 @@ This is relative to `smtpmail-queue-dir'.") (host (or smtpmail-smtp-server (error "`smtpmail-smtp-server' not defined"))) (port smtpmail-smtp-service) - (envelope-from (mail-envelope-from)) + (envelope-from (or (mail-envelope-from) + smtpmail-mail-address + user-mail-address)) response-code greeting process-buffer @@ -691,11 +693,10 @@ This is relative to `smtpmail-queue-dir'.") ""))) ; (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn))) (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s" - (or envelope-from - smtpmail-mail-address) + envelope-from size-part body-part)) - + (if (or (null (car (setq response-code (smtpmail-read-response process)))) (not (integerp (car response-code))) (>= (car response-code) 400)) -- 2.30.2